Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 26 Aug 2011 18:39:24 +0000 (11:39 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 26 Aug 2011 18:39:24 +0000 (11:39 -0700)

Trivial merge